Support inverting arrows via XSetting. (#377979, Yevgen Muntyan).

2006-12-27  Kristian Rietveld  <kris@gtk.org>

	Support inverting arrows via XSetting. (#377979, Yevgen Muntyan).

	* gtk/gtksettings.c (gtk_settings_class_init): add new setting
	gtk-alternative-sort-arrows.

	* gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): add
	new setting.

	* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: set new
	gtk-alternative-sort-arrows setting to true.

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button):
	invert direction if gtk-alternative-sort-arrows is TRUE.

diff --git a/ChangeLog b/ChangeLog
index a6d62b7583b4fce74ed67d1c541e9181f0a4bd84..3bdb5c563a1db06327ac39388c4bf1140013af85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-12-27  Kristian Rietveld  <kris@gtk.org>
+
+       Support inverting arrows via XSetting. (#377979, Yevgen Muntyan).
+
+       * gtk/gtksettings.c (gtk_settings_class_init): add new setting
+       gtk-alternative-sort-arrows.
+
+       * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): add
+       new setting.
+
+       * modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: set new
+       gtk-alternative-sort-arrows setting to true.
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button):
+       invert direction if gtk-alternative-sort-arrows is TRUE.
+
 2006-12-27  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtk.symbols: Add gtk_status_icon_get_screen and

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 37fc2fdf8c666dc1d2186a2eecbaa91fdd7a807e..e4bdc81ae9966d0a63f510410d9814b162145b99 100644 (file)
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -421,6 +421,12 @@ gdk_screen_get_setting (GdkScreen   *screen,
       g_value_set_boolean (value, TRUE);
       return TRUE;
     }
+  else if (strcmp ("gtk-alternative-sort-arrows", name) == 0)
+    {
+      GDK_NOTE(MISC, g_print("gdk_screen_get_setting(\"%s\") : TRUE\n", name));
+      g_value_set_boolean (value, TRUE);
+      return TRUE;
+    }
 #if 0
   /*
    * With 'MS Sans Serif' as windows menu font (default on win98se) you'll get a 

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index bd969c64b6a9f1b450b66788b3fccf4fb7796585..707139af68f97c044cc61d4523c52af288e88ce1 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -85,6 +85,7 @@ enum {
   PROP_CURSOR_THEME_SIZE,
 #endif
   PROP_ALTERNATIVE_BUTTON_ORDER,
+  PROP_ALTERNATIVE_SORT_ARROWS,
   PROP_SHOW_INPUT_METHOD_MENU,
   PROP_SHOW_UNICODE_MENU,
   PROP_TIMEOUT_INITIAL,
@@ -419,6 +420,24 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                              NULL);
   g_assert (result == PROP_ALTERNATIVE_BUTTON_ORDER);
 
+  /**
+   * GtkSettings:gtk-alternative-sort-arrows:
+   *
+   * Controls the direction of the sort indicators in sorted list and tree
+   * views.  By default an arrow pointing down means the column is sorted
+   * in ascending order.  When set to %TRUE, this order will be inverted.
+   *
+   * Since: 2.12
+   */
+  result = settings_install_property_parser (class,
+                                             g_param_spec_boolean ("gtk-alternative-sort-arrows",
+                                                                  P_("Alternative sort indicator direction"),
+                                                                  P_("Whether the direction of the sort indicators in list and tree views is inverted compared to the default (where down means ascending)"),
+                                                                  FALSE,
+                                                                  GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_ALTERNATIVE_SORT_ARROWS);
+
   result = settings_install_property_parser (class,
                                             g_param_spec_boolean ("gtk-show-input-method-menu",
                                                                   P_("Show the 'Input Methods' menu"),

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index b529db54a1a0a76553685c93a92af1fe5d0bcfef..69cd5f7fb59ba993e6f276cffc30b4cba6300c9d 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -913,14 +913,20 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
   if (tree_column->show_sort_indicator
       || (sort_column_id >= 0 && sort_column_id == tree_column->sort_column_id))
     {
+      gboolean alternative;
+
+      g_object_get (gtk_widget_get_settings (tree_column->tree_view),
+                   "gtk-alternative-sort-arrows", &alternative,
+                   NULL);
+
       switch (tree_column->sort_order)
         {
          case GTK_SORT_ASCENDING:
-           arrow_type = GTK_ARROW_DOWN;
+           arrow_type = alternative ? GTK_ARROW_UP : GTK_ARROW_DOWN;
            break;
 
          case GTK_SORT_DESCENDING:
-           arrow_type = GTK_ARROW_UP;
+           arrow_type = alternative ? GTK_ARROW_DOWN : GTK_ARROW_UP;
            break;
 
          default:

diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index 39f2a7b14cfbbfc07effb46488be0af9a6decb5b..0553fb0b2ccf6cb86347e6216bb0d49beeacb1e0 100755 (executable)
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -11,6 +11,9 @@ gtk-menu-images = 1
 # use the win32 button ordering instead of the GNOME HIG one, where applicable
 gtk-alternative-button-order = 1
 
+# use the win32 sort indicators direction, as in Explorer
+gtk-alternative-sort-arrows = 1
+
 style "msw-default"
 {
   GtkWidget::interior-focus = 1